merge with xen-unstable.hg for tools/ioemu build fix
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 21:59:36 +0000 (15:59 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 21:59:36 +0000 (15:59 -0600)

Trivial merge